From d5241b33534e30d4b7d437e6362d4e49039e571a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 6 Mar 2016 00:40:31 +0000 Subject: [PATCH] thermal: Fix ABI change in 4.4.4 struct thermal_zone_device is always allocated in thermal_core and the new field is only used there. So we can safely move it to the end of the structure and hide it from genksyms. Also hide the new #include, as if it could make an actual difference, stupid genksyms... Gbp-Pq: Topic debian Gbp-Pq: Name thermal-fix-abi-change-in-4.4.4.patch --- drivers/thermal/thermal_core.c | 2 ++ include/linux/thermal.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index ba08b5521382..65bebc8d78eb 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -37,7 +37,9 @@ #include #include #include +#ifndef __GENKSYMS__ #include +#endif #define CREATE_TRACE_POINTS #include diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e13a1ace50e9..65481b9c1a43 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -198,7 +198,6 @@ struct thermal_zone_device { int emul_temperature; int passive; unsigned int forced_passive; - atomic_t need_update; struct thermal_zone_device_ops *ops; struct thermal_zone_params *tzp; struct thermal_governor *governor; @@ -208,6 +207,9 @@ struct thermal_zone_device { struct mutex lock; struct list_head node; struct delayed_work poll_queue; +#ifndef __GENKSYMS__ + atomic_t need_update; +#endif }; /** -- 2.30.2